6eb970f9cb93a7a0c0f94b412f5dde5c9994f02f,src/spade/storage/CDM.java,CDM,createPrincipal,#AbstractVertex#,704

Before Change


            List<CharSequence> groupIds = new ArrayList<CharSequence>();
            groupIds.add(principalVertex.getAnnotation("gid"));
            principalBuilder.setGroupIds(groupIds);
            principalBuilder.setProperties(properties);
            principalBuilder.setType(PrincipalType.PRINCIPAL_LOCAL);
            InstrumentationSource source = getInstrumentationSource(principalVertex.getAnnotation("source"));
            if(source == null){

After Change


            }
            
            String userId = principalVertex.getAnnotation("uid");
            if(userId == null){
            	logger.log(Level.WARNING, "Missing user id for principal: " + principalVertex);
            	return null;
            }
            
        	Principal.Builder principalBuilder = Principal.newBuilder();
        	principalBuilder.setUuid(getUuid(principalVertex));
        	principalBuilder.setType(PrincipalType.PRINCIPAL_LOCAL);
        	principalBuilder.setSource(source);
        	principalBuilder.setUserId(userId);
                        
            Map<CharSequence, CharSequence> properties = new HashMap<CharSequence, CharSequence>();
            addIfNotNull("euid", principalVertex.getAnnotations(), properties);
            addIfNotNull("egid", principalVertex.getAnnotations(), properties);
            principalBuilder.setProperties(properties);
            
            List<CharSequence> groupIds = new ArrayList<CharSequence>();
            if(principalVertex.getAnnotation("gid") != null){